diff --git a/comment_notify.module b/comment_notify.module
index 87f2cb7..dd25911 100644
--- a/comment_notify.module
+++ b/comment_notify.module
@@ -483,7 +483,7 @@ function _comment_notify_mailalert($comment) {
       );
 
       foreach ($raw_values as $k => $v) {
-        $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $user));
+        $message[$k] = token_replace(t($v), array('comment' => $comment, 'watcher' => $alert, 'node' => $node, 'user' => $user));
       }
 
       drupal_mail('comment_notify', 'comment_notify_mail', $mail, $language, $message);
diff --git a/comment_notify.tokens.inc b/comment_notify.tokens.inc
index 2f1dab7..9288021 100644
--- a/comment_notify.tokens.inc
+++ b/comment_notify.tokens.inc
@@ -38,12 +38,15 @@ function comment_notify_tokens($type, $tokens, array $data = array(), array $opt
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'unsubscribe-url':
+          $watcher = $data['watcher'];
           module_load_include('inc', 'comment_notify', 'comment_notify');
-          if ($hash = comment_notify_get_notify_hash($comment->cid)) {
+          if ($hash = comment_notify_get_notify_hash($watcher->cid)) {
             $replacements[$original] = url('comment_notify/disable/' . $hash, $url_options);
           }
           break;
       }
     }
   }
+
+  return $replacements;
 }